From b9af069ce2edc1f4e443dfd21e0fb9de05d00b57 Mon Sep 17 00:00:00 2001 From: Peter Michael Green Date: Sun, 3 Sep 2017 22:54:39 +0000 Subject: [PATCH] Revert change to configure.json that didn't work, the next commit will have a different modification. --- configure.json | 8 ++++ ...74b9347b18735f7fbb6412e1e99c75c-1504443823 | 43 ------------------- debian/patches/series | 1 - 3 files changed, 8 insertions(+), 44 deletions(-) delete mode 100644 debian/patches/auto-5.9.1+dfsg-9+rpi1-9305cb3d174b9347b18735f7fbb6412e1e99c75c-1504443823 diff --git a/configure.json b/configure.json index e5320b8d1..b572a3d1f 100644 --- a/configure.json +++ b/configure.json @@ -894,6 +894,14 @@ { "type": "define", "name": "QT_COMPILER_SUPPORTS_MIPS_DSPR2", "value": 1 } ] }, + "neon": { + "label": "NEON", + "condition": "(arch.arm || arch.arm64) && tests.neon", + "output": [ + "privateConfig", + { "type": "define", "name": "QT_COMPILER_SUPPORTS_NEON", "value": 1 } + ] + }, "mremap": { "label": "mremap()", "condition": "tests.mremap", diff --git a/debian/patches/auto-5.9.1+dfsg-9+rpi1-9305cb3d174b9347b18735f7fbb6412e1e99c75c-1504443823 b/debian/patches/auto-5.9.1+dfsg-9+rpi1-9305cb3d174b9347b18735f7fbb6412e1e99c75c-1504443823 deleted file mode 100644 index 9dbc6c1bd..000000000 --- a/debian/patches/auto-5.9.1+dfsg-9+rpi1-9305cb3d174b9347b18735f7fbb6412e1e99c75c-1504443823 +++ /dev/null @@ -1,43 +0,0 @@ -From: Peter Michael Green -Subject: Automatically generated patch (5.9.1+dfsg-9+rpi1) - -Last (up to) 3 git changes, FYI: - -commit 9305cb3d174b9347b18735f7fbb6412e1e99c75c -Author: Peter Michael Green -Date: Sun Sep 3 13:02:16 2017 +0000 - - Remove broken patch from quilt series. - -commit 4f406fb7400e0cfdf6c88c1fa01534f063a961c0 -Merge: 8bf70a2c 802d6f6e -Author: Peter Michael Green -Date: Sun Sep 3 12:56:50 2017 +0000 - - Manual merge of version 5.7.1+dfsg-4+rpi1 and 5.9.1+dfsg-9 to produce 5.9.1+dfsg-9+rpi1 - -commit 802d6f6edac7e3257bac155727bf55623b7cee34 -Merge: dd9ca752 41b462b6 -Author: Dmitry Shachnev -Date: Sun Aug 20 17:13:27 2017 +0100 - - Merge qtbase-opensource-src (5.9.1+dfsg-9) import into refs/heads/workingbranch ---- - ---- qtbase-opensource-src-5.9.1+dfsg.orig/configure.json -+++ qtbase-opensource-src-5.9.1+dfsg/configure.json -@@ -894,14 +894,6 @@ - { "type": "define", "name": "QT_COMPILER_SUPPORTS_MIPS_DSPR2", "value": 1 } - ] - }, -- "neon": { -- "label": "NEON", -- "condition": "(arch.arm || arch.arm64) && tests.neon", -- "output": [ -- "privateConfig", -- { "type": "define", "name": "QT_COMPILER_SUPPORTS_NEON", "value": 1 } -- ] -- }, - "mremap": { - "label": "mremap()", - "condition": "tests.mremap", diff --git a/debian/patches/series b/debian/patches/series index f3f48e1d0..3a414d618 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -9,4 +9,3 @@ link_fbclient.diff gnukfreebsd_cloexec.diff armv4.diff nonlinux_utime.diff -auto-5.9.1+dfsg-9+rpi1-9305cb3d174b9347b18735f7fbb6412e1e99c75c-1504443823 -- 2.30.2